Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:24:53 +0000 (22:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:24:53 +0000 (22:24 -0700)
commit1e8718df535ecf13ec2082ac903bf5637ea4a77d
tree174538fc7e04986f0bc4eca0e5ed32cb184983a7
parent5de85475989bd676e2c3dd0c36ad5822e7cc497d
parent48f1fc966038f48aa99eee937f3cca234d553c32
Merge from trunk.
src/ChangeLog